Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adds a visible line when using iv drips / bloodpacks #3645

Merged
merged 16 commits into from
Jul 8, 2023
Merged

adds a visible line when using iv drips / bloodpacks #3645

merged 16 commits into from
Jul 8, 2023

Conversation

realkhad
Copy link
Contributor

@realkhad realkhad commented Jun 15, 2023 •
edited
Loading

About the pull request

https://forum.cm-ss13.com/t/giving-blood-shows-visible-line/2610
adds a line between the person receiving blood and where the blood is coming from, similar to the phone cable

Explain why it's good for the game

soul :]

Testing Photographs and Procedure

2023-06-29.18-48-07.mp4

Changelog

🆑Khadd
add: added a iv tube between the user and the bloodpack / iv drip
imageadd: sprites for the iv tube
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Jun 15, 2023
@cm13live
Copy link

This pull request has been mentioned on CM-SS13. Please provide feedback here:

https://forum.cm-ss13.com/t/giving-blood-shows-visible-line/2610/2

harryob
harryob requested changes Jun 17, 2023
View reviewed changes
code/game/machinery/iv_drip.dm Outdated Show resolved Hide resolved
code/game/objects/items/reagent_containers/blood_pack.dm Outdated Show resolved Hide resolved
code/game/machinery/iv_drip.dm Outdated Show resolved Hide resolved
@realkhad realkhad requested a review from harryob June 17, 2023 15:26
harryob
harryob requested changes Jun 18, 2023
View reviewed changes
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nothing further from me, still needs @cmss13-devs/spriters

code/game/machinery/iv_drip.dm Outdated Show resolved Hide resolved
@realkhad realkhad requested a review from harryob June 18, 2023 15:16
@zzzmike zzzmike mentioned this pull request Jun 19, 2023
Closed
3 tasks
@DaTruRiZZoB DaTruRiZZoB mentioned this pull request Jun 20, 2023
Closed
3 tasks
@Superwelder Superwelder mentioned this pull request Jun 24, 2023
Open
3 tasks
sleepynecrons
sleepynecrons suggested changes Jul 2, 2023
View reviewed changes
Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just use iv_beam for both the connection and when it's active. there's no need to show the blood moving and it just looks like something out of cruelty squad. the iv_beam itself also should just use colors from the iv pole
image
something like on the right

sleepynecrons
sleepynecrons approved these changes Jul 4, 2023
View reviewed changes
Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sprite approved

@sleepynecrons sleepynecrons added the Sprites Approved confirmed no stray pixels label Jul 4, 2023
@chapterob

This comment was marked as abuse.

Sign in to view
@realkhad
Copy link
Contributor Author

realkhad commented Jul 4, 2023

just use iv_beam for both the connection and when it's active. there's no need to show the blood moving and it just looks like something out of cruelty squad. the iv_beam itself also should just use colors from the iv pole image something like on the right

the purpose for the animated blood sprite was to show which direction the reagents were going and if there were even any reagents being exchanged (if not it would just turn into the empty iv tube sprite)

Drulikar
Drulikar requested changes Jul 6, 2023
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functionally works, just a couple things to tweak.

code/game/machinery/iv_drip.dm Outdated Show resolved Hide resolved
code/game/machinery/iv_drip.dm Outdated Show resolved Hide resolved
code/game/machinery/iv_drip.dm Outdated Show resolved Hide resolved
code/game/machinery/iv_drip.dm Outdated Show resolved Hide resolved
code/game/machinery/iv_drip.dm Show resolved Hide resolved
@sleepynecrons
Copy link
Contributor

just use iv_beam for both the connection and when it's active. there's no need to show the blood moving and it just looks like something out of cruelty squad. the iv_beam itself also should just use colors from the iv pole image something like on the right

the purpose for the animated blood sprite was to show which direction the reagents were going and if there were even any reagents being exchanged (if not it would just turn into the empty iv tube sprite)

i know what the purpose was, it just doesn't look good in-game and you already have a HUD icon telling you if you're having blood transfused

@realkhad @Drulikar
final tweaks
4292a16 
Co-authored-by: Drathek <[email protected]>
@realkhad realkhad requested a review from Drulikar July 7, 2023 09:37
@Drulikar Drulikar added this pull request to the merge queue Jul 8, 2023
Merged via the queue into cmss13-devs:master with commit 18e0f69 Jul 8, 2023
github-actions bot added a commit that referenced this pull request Jul 8, 2023
@github-actions
Updating GBP balances for #3645
086a54a
cm13-github added a commit that referenced this pull request Jul 8, 2023
@cm13-github
Automatic changelog for PR #3645 [ci skip]
3831ea9
@Drulikar Drulikar mentioned this pull request Jul 10, 2023
Closed
3 tasks
@Drulikar Drulikar mentioned this pull request Aug 9, 2023
Merged
github-merge-queue bot pushed a commit that referenced this pull request Aug 10, 2023
@Drulikar
Fix beams for IV drip machines when adding/removing a blood bag (#4145)
0dd5cb6 
# About the pull request

This PR is a followup to #3645 fixing the beam getting into an incorrect
state when adding/removing a bag when the drip is already connected to
someone. Also fixes a lingering reference to the attached mob ever the
drip is destroyed.

# Explain why it's good for the game

Fixes this: 


https://github.com/cmss13-devs/cmss13/assets/76988376/77a69934-0eb9-4322-b0c5-74a53a34700f

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: Drathek
fix: Fix IV Drip machines not displaying the IV line correctly when
adding/removing a bag when already attached
code: Fixes a lingering reference to the mob when a IV drip machine is
destroyed.
/:cl:
@fe-ed fe-ed mentioned this pull request Feb 4, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sleepynecrons sleepynecrons sleepynecrons approved these changes

@Drulikar Drulikar Drulikar approved these changes

@harryob harryob Awaiting requested review from harryob

@morrowwolf morrowwolf Awaiting requested review from morrowwolf

Assignees
No one assigned
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@realkhad @cm13live @chapterob @sleepynecrons @morrowwolf @harryob @Drulikar